Skip to content

perf: Add accountIdByAddress to AccountsController state#7893

Open
hmalik88 wants to merge 42 commits intomainfrom
hm/mul-1449
Open

perf: Add accountIdByAddress to AccountsController state#7893
hmalik88 wants to merge 42 commits intomainfrom
hm/mul-1449

Conversation

@hmalik88
Copy link
Contributor

@hmalik88 hmalik88 commented Feb 10, 2026

Explanation

Currently when doing an account lookup by address we're doing an O(n) operation in the clients, this has been improved to O(1) by adding an address -> account id mapping in state. The getAccountByAddress function now also takes advantage of this new piece of state to improve its lookup time.

Note: This will require a migration in the clients.

References

N/A

Checklist

  • I've updated the test suite for new or updated code as appropriate
  • I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate
  • I've communicated my changes to consumers by updating changelogs for packages I've changed
  • I've introduced breaking changes in this PR and have prepared draft pull requests for clients and consumer packages to resolve them

Note

Medium Risk
State shape changes by adding accountIdByAddress (non-persisted) and making getAccountByAddress depend on it, which requires client-side migration and could break lookups if callers use differently-cased addresses than the stored key.

Overview
Adds an address→account ID index to AccountsController state (accountIdByAddress) to make address-based account lookups O(1).

getAccountByAddress now resolves via this map, and the controller keeps the map in sync when constructing initial state, updating accounts from keyrings, loading backups, and processing account add/remove patches. Tests and fixtures across dependent packages are updated to include the new state field, and a new constructAccountIdByAddress helper (with tests) is introduced; the changelog documents the change.

Written by Cursor Bugbot for commit 22ff1f0. This will update automatically on new commits. Configure here.

@hmalik88 hmalik88 requested a review from a team as a code owner February 10, 2026 16:13
@hmalik88 hmalik88 requested a review from a team as a code owner February 10, 2026 16:14
@hmalik88 hmalik88 changed the title perf: Add accountIdByAddress to AccountsController state perf!: Add accountIdByAddress to AccountsController state Feb 10, 2026
@hmalik88 hmalik88 requested a review from a team as a code owner February 10, 2026 19:37
@hmalik88 hmalik88 changed the title perf!: Add accountIdByAddress to AccountsController state perf: Add accountIdByAddress to AccountsController state Feb 20, 2026
Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.

Copy link
Member

@gantunesr gantunesr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, lets just solve the comment left by cursor

@hmalik88
Copy link
Contributor Author

@metamaskbot publish-previews

@github-actions
Copy link
Contributor

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.
{
  "@metamask-previews/account-tree-controller": "4.1.1-preview-7cbd7910e",
  "@metamask-previews/accounts-controller": "36.0.1-preview-7cbd7910e",
  "@metamask-previews/address-book-controller": "7.0.1-preview-7cbd7910e",
  "@metamask-previews/ai-controllers": "0.1.0-preview-7cbd7910e",
  "@metamask-previews/analytics-controller": "1.0.0-preview-7cbd7910e",
  "@metamask-previews/analytics-data-regulation-controller": "0.0.0-preview-7cbd7910e",
  "@metamask-previews/announcement-controller": "8.0.0-preview-7cbd7910e",
  "@metamask-previews/app-metadata-controller": "2.0.0-preview-7cbd7910e",
  "@metamask-previews/approval-controller": "8.0.0-preview-7cbd7910e",
  "@metamask-previews/assets-controller": "2.1.0-preview-7cbd7910e",
  "@metamask-previews/assets-controllers": "100.0.3-preview-7cbd7910e",
  "@metamask-previews/base-controller": "9.0.0-preview-7cbd7910e",
  "@metamask-previews/base-data-service": "0.0.0-preview-7cbd7910e",
  "@metamask-previews/bridge-controller": "67.3.0-preview-7cbd7910e",
  "@metamask-previews/bridge-status-controller": "67.0.1-preview-7cbd7910e",
  "@metamask-previews/build-utils": "3.0.4-preview-7cbd7910e",
  "@metamask-previews/chain-agnostic-permission": "1.4.0-preview-7cbd7910e",
  "@metamask-previews/claims-controller": "0.4.2-preview-7cbd7910e",
  "@metamask-previews/client-controller": "1.0.0-preview-7cbd7910e",
  "@metamask-previews/compliance-controller": "1.0.1-preview-7cbd7910e",
  "@metamask-previews/composable-controller": "12.0.0-preview-7cbd7910e",
  "@metamask-previews/connectivity-controller": "0.1.0-preview-7cbd7910e",
  "@metamask-previews/controller-utils": "11.19.0-preview-7cbd7910e",
  "@metamask-previews/core-backend": "6.0.0-preview-7cbd7910e",
  "@metamask-previews/delegation-controller": "2.0.1-preview-7cbd7910e",
  "@metamask-previews/earn-controller": "11.1.1-preview-7cbd7910e",
  "@metamask-previews/eip-5792-middleware": "3.0.0-preview-7cbd7910e",
  "@metamask-previews/eip-7702-internal-rpc-middleware": "0.1.0-preview-7cbd7910e",
  "@metamask-previews/eip1193-permission-middleware": "1.0.3-preview-7cbd7910e",
  "@metamask-previews/ens-controller": "19.0.3-preview-7cbd7910e",
  "@metamask-previews/error-reporting-service": "3.0.1-preview-7cbd7910e",
  "@metamask-previews/eth-block-tracker": "15.0.1-preview-7cbd7910e",
  "@metamask-previews/eth-json-rpc-middleware": "23.1.0-preview-7cbd7910e",
  "@metamask-previews/eth-json-rpc-provider": "6.0.0-preview-7cbd7910e",
  "@metamask-previews/foundryup": "1.0.1-preview-7cbd7910e",
  "@metamask-previews/gas-fee-controller": "26.0.3-preview-7cbd7910e",
  "@metamask-previews/gator-permissions-controller": "2.0.0-preview-7cbd7910e",
  "@metamask-previews/json-rpc-engine": "10.2.2-preview-7cbd7910e",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.8-preview-7cbd7910e",
  "@metamask-previews/keyring-controller": "25.1.0-preview-7cbd7910e",
  "@metamask-previews/logging-controller": "7.0.1-preview-7cbd7910e",
  "@metamask-previews/message-manager": "14.1.0-preview-7cbd7910e",
  "@metamask-previews/messenger": "0.3.0-preview-7cbd7910e",
  "@metamask-previews/multichain-account-service": "7.0.0-preview-7cbd7910e",
  "@metamask-previews/multichain-api-middleware": "1.2.7-preview-7cbd7910e",
  "@metamask-previews/multichain-network-controller": "3.0.4-preview-7cbd7910e",
  "@metamask-previews/multichain-transactions-controller": "7.0.1-preview-7cbd7910e",
  "@metamask-previews/name-controller": "9.0.0-preview-7cbd7910e",
  "@metamask-previews/network-controller": "30.0.0-preview-7cbd7910e",
  "@metamask-previews/network-enablement-controller": "4.1.2-preview-7cbd7910e",
  "@metamask-previews/notification-services-controller": "22.0.0-preview-7cbd7910e",
  "@metamask-previews/permission-controller": "12.2.0-preview-7cbd7910e",
  "@metamask-previews/permission-log-controller": "5.0.0-preview-7cbd7910e",
  "@metamask-previews/perps-controller": "0.0.0-preview-7cbd7910e",
  "@metamask-previews/phishing-controller": "16.3.0-preview-7cbd7910e",
  "@metamask-previews/polling-controller": "16.0.3-preview-7cbd7910e",
  "@metamask-previews/preferences-controller": "22.1.0-preview-7cbd7910e",
  "@metamask-previews/profile-metrics-controller": "3.0.1-preview-7cbd7910e",
  "@metamask-previews/profile-sync-controller": "27.1.0-preview-7cbd7910e",
  "@metamask-previews/ramps-controller": "10.0.0-preview-7cbd7910e",
  "@metamask-previews/rate-limit-controller": "7.0.0-preview-7cbd7910e",
  "@metamask-previews/remote-feature-flag-controller": "4.1.0-preview-7cbd7910e",
  "@metamask-previews/sample-controllers": "4.0.3-preview-7cbd7910e",
  "@metamask-previews/seedless-onboarding-controller": "8.1.0-preview-7cbd7910e",
  "@metamask-previews/selected-network-controller": "26.0.3-preview-7cbd7910e",
  "@metamask-previews/shield-controller": "5.0.1-preview-7cbd7910e",
  "@metamask-previews/signature-controller": "39.0.4-preview-7cbd7910e",
  "@metamask-previews/storage-service": "1.0.0-preview-7cbd7910e",
  "@metamask-previews/subscription-controller": "6.0.0-preview-7cbd7910e",
  "@metamask-previews/transaction-controller": "62.19.0-preview-7cbd7910e",
  "@metamask-previews/transaction-pay-controller": "16.1.0-preview-7cbd7910e",
  "@metamask-previews/user-operation-controller": "41.0.3-preview-7cbd7910e"
}

@hmalik88
Copy link
Contributor Author

hmalik88 commented Mar 3, 2026

@metamaskbot publish-previews

@hmalik88
Copy link
Contributor Author

hmalik88 commented Mar 3, 2026

@metamaskbot publish-previews

@github-actions
Copy link
Contributor

github-actions bot commented Mar 3, 2026

Preview builds have been published. See these instructions for more information about preview builds.

Expand for full list of packages and versions.
{
  "@metamask-previews/account-tree-controller": "4.1.1-preview-22ff1f0f2",
  "@metamask-previews/accounts-controller": "36.0.1-preview-22ff1f0f2",
  "@metamask-previews/address-book-controller": "7.0.1-preview-22ff1f0f2",
  "@metamask-previews/ai-controllers": "0.1.0-preview-22ff1f0f2",
  "@metamask-previews/analytics-controller": "1.0.0-preview-22ff1f0f2",
  "@metamask-previews/analytics-data-regulation-controller": "0.0.0-preview-22ff1f0f2",
  "@metamask-previews/announcement-controller": "8.0.0-preview-22ff1f0f2",
  "@metamask-previews/app-metadata-controller": "2.0.0-preview-22ff1f0f2",
  "@metamask-previews/approval-controller": "8.0.0-preview-22ff1f0f2",
  "@metamask-previews/assets-controller": "2.2.0-preview-22ff1f0f2",
  "@metamask-previews/assets-controllers": "100.0.3-preview-22ff1f0f2",
  "@metamask-previews/base-controller": "9.0.0-preview-22ff1f0f2",
  "@metamask-previews/base-data-service": "0.0.0-preview-22ff1f0f2",
  "@metamask-previews/bridge-controller": "67.4.0-preview-22ff1f0f2",
  "@metamask-previews/bridge-status-controller": "67.0.1-preview-22ff1f0f2",
  "@metamask-previews/build-utils": "3.0.4-preview-22ff1f0f2",
  "@metamask-previews/chain-agnostic-permission": "1.4.0-preview-22ff1f0f2",
  "@metamask-previews/claims-controller": "0.4.2-preview-22ff1f0f2",
  "@metamask-previews/client-controller": "1.0.0-preview-22ff1f0f2",
  "@metamask-previews/compliance-controller": "1.0.1-preview-22ff1f0f2",
  "@metamask-previews/composable-controller": "12.0.0-preview-22ff1f0f2",
  "@metamask-previews/connectivity-controller": "0.1.0-preview-22ff1f0f2",
  "@metamask-previews/controller-utils": "11.19.0-preview-22ff1f0f2",
  "@metamask-previews/core-backend": "6.0.0-preview-22ff1f0f2",
  "@metamask-previews/delegation-controller": "2.0.1-preview-22ff1f0f2",
  "@metamask-previews/earn-controller": "11.1.1-preview-22ff1f0f2",
  "@metamask-previews/eip-5792-middleware": "3.0.0-preview-22ff1f0f2",
  "@metamask-previews/eip-7702-internal-rpc-middleware": "0.1.0-preview-22ff1f0f2",
  "@metamask-previews/eip1193-permission-middleware": "1.0.3-preview-22ff1f0f2",
  "@metamask-previews/ens-controller": "19.0.3-preview-22ff1f0f2",
  "@metamask-previews/error-reporting-service": "3.0.1-preview-22ff1f0f2",
  "@metamask-previews/eth-block-tracker": "15.0.1-preview-22ff1f0f2",
  "@metamask-previews/eth-json-rpc-middleware": "23.1.0-preview-22ff1f0f2",
  "@metamask-previews/eth-json-rpc-provider": "6.0.0-preview-22ff1f0f2",
  "@metamask-previews/foundryup": "1.0.1-preview-22ff1f0f2",
  "@metamask-previews/gas-fee-controller": "26.0.3-preview-22ff1f0f2",
  "@metamask-previews/gator-permissions-controller": "2.0.0-preview-22ff1f0f2",
  "@metamask-previews/geolocation-controller": "0.0.0-preview-22ff1f0f2",
  "@metamask-previews/json-rpc-engine": "10.2.3-preview-22ff1f0f2",
  "@metamask-previews/json-rpc-middleware-stream": "8.0.8-preview-22ff1f0f2",
  "@metamask-previews/keyring-controller": "25.1.0-preview-22ff1f0f2",
  "@metamask-previews/logging-controller": "7.0.1-preview-22ff1f0f2",
  "@metamask-previews/message-manager": "14.1.0-preview-22ff1f0f2",
  "@metamask-previews/messenger": "0.3.0-preview-22ff1f0f2",
  "@metamask-previews/multichain-account-service": "7.0.0-preview-22ff1f0f2",
  "@metamask-previews/multichain-api-middleware": "1.2.7-preview-22ff1f0f2",
  "@metamask-previews/multichain-network-controller": "3.0.4-preview-22ff1f0f2",
  "@metamask-previews/multichain-transactions-controller": "7.0.1-preview-22ff1f0f2",
  "@metamask-previews/name-controller": "9.0.0-preview-22ff1f0f2",
  "@metamask-previews/network-controller": "30.0.0-preview-22ff1f0f2",
  "@metamask-previews/network-enablement-controller": "4.1.2-preview-22ff1f0f2",
  "@metamask-previews/notification-services-controller": "22.0.0-preview-22ff1f0f2",
  "@metamask-previews/permission-controller": "12.2.0-preview-22ff1f0f2",
  "@metamask-previews/permission-log-controller": "5.0.0-preview-22ff1f0f2",
  "@metamask-previews/perps-controller": "0.0.0-preview-22ff1f0f2",
  "@metamask-previews/phishing-controller": "16.3.0-preview-22ff1f0f2",
  "@metamask-previews/polling-controller": "16.0.3-preview-22ff1f0f2",
  "@metamask-previews/preferences-controller": "22.1.0-preview-22ff1f0f2",
  "@metamask-previews/profile-metrics-controller": "3.0.1-preview-22ff1f0f2",
  "@metamask-previews/profile-sync-controller": "27.1.0-preview-22ff1f0f2",
  "@metamask-previews/ramps-controller": "10.0.0-preview-22ff1f0f2",
  "@metamask-previews/rate-limit-controller": "7.0.0-preview-22ff1f0f2",
  "@metamask-previews/remote-feature-flag-controller": "4.1.0-preview-22ff1f0f2",
  "@metamask-previews/sample-controllers": "4.0.3-preview-22ff1f0f2",
  "@metamask-previews/seedless-onboarding-controller": "8.1.0-preview-22ff1f0f2",
  "@metamask-previews/selected-network-controller": "26.0.3-preview-22ff1f0f2",
  "@metamask-previews/shield-controller": "5.0.1-preview-22ff1f0f2",
  "@metamask-previews/signature-controller": "39.0.4-preview-22ff1f0f2",
  "@metamask-previews/storage-service": "1.0.0-preview-22ff1f0f2",
  "@metamask-previews/subscription-controller": "6.0.0-preview-22ff1f0f2",
  "@metamask-previews/transaction-controller": "62.19.0-preview-22ff1f0f2",
  "@metamask-previews/transaction-pay-controller": "16.1.1-preview-22ff1f0f2",
  "@metamask-previews/user-operation-controller": "41.0.3-preview-22ff1f0f2"
}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants